From 5ba1a57d44cbec9122e921f2febd48255f607cd2 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 23 Jul 2010 17:39:32 +0100 Subject: [PATCH] libxl/xl: correctly report domain state. In particular distinguish between domain shutdown and crash and the blocked and running states. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Ian Jackson Committed-by: Ian Jackson --- tools/libxl/libxl.c | 26 ++++++++++++++++++-------- tools/libxl/libxl.h | 7 +++++-- tools/libxl/xl_cmdimpl.c | 5 ++++- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index eb59ce29d7..9070cf94fa 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -402,17 +402,27 @@ int libxl_domain_resume(struct libxl_ctx *ctx, uint32_t domid) } static void xcinfo2xlinfo(const xc_domaininfo_t *xcinfo, - struct libxl_dominfo *xlinfo) { + struct libxl_dominfo *xlinfo) +{ + unsigned int shutdown_reason; + memcpy(&(xlinfo->uuid), xcinfo->handle, sizeof(xen_domain_handle_t)); xlinfo->domid = xcinfo->domain; - if (xcinfo->flags & XEN_DOMINF_dying) - xlinfo->dying = 1; - else if (xcinfo->flags & XEN_DOMINF_paused) - xlinfo->paused = 1; - else if (xcinfo->flags & XEN_DOMINF_blocked || - xcinfo->flags & XEN_DOMINF_running) - xlinfo->running = 1; + xlinfo->dying = !!(xcinfo->flags&XEN_DOMINF_dying); + xlinfo->shutdown = !!(xcinfo->flags&XEN_DOMINF_shutdown); + xlinfo->paused = !!(xcinfo->flags&XEN_DOMINF_paused); + xlinfo->blocked = !!(xcinfo->flags&XEN_DOMINF_blocked); + xlinfo->running = !!(xcinfo->flags&XEN_DOMINF_running); + xlinfo->crashed = 0; + + shutdown_reason = (xcinfo->flags>>XEN_DOMINF_shutdownshift) & XEN_DOMINF_shutdownmask; + + if ( xlinfo->shutdown && (shutdown_reason == SHUTDOWN_crash) ) { + xlinfo->shutdown = 0; + xlinfo->crashed = 1; + } + xlinfo->max_memkb = PAGE_TO_MEMKB(xcinfo->tot_pages); xlinfo->cpu_time = xcinfo->cpu_time; xlinfo->vcpu_max_id = xcinfo->max_vcpu_id; diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 057840ffc6..39a691ce2f 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -25,9 +25,12 @@ struct libxl_dominfo { uint8_t uuid[16]; uint32_t domid; - uint8_t dying:1; - uint8_t paused:1; uint8_t running:1; + uint8_t blocked:1; + uint8_t paused:1; + uint8_t shutdown:1; + uint8_t crashed:1; + uint8_t dying:1; uint64_t max_memkb; uint64_t cpu_time; uint32_t vcpu_max_id; diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 8e62c0baaf..02c84ac3ca 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1920,13 +1920,16 @@ void list_domains(int verbose) } printf("Name ID Mem VCPUs\tState\tTime(s)\n"); for (i = 0; i < nb_domain; i++) { - printf("%-40s %5d %5lu %5d %c%c%c %8.1f", + printf("%-40s %5d %5lu %5d %c%c%c%c%c%c %8.1f", libxl_domid_to_name(&ctx, info[i].domid), info[i].domid, (unsigned long) (info[i].max_memkb / 1024), info[i].vcpu_online, info[i].running ? 'r' : '-', + info[i].blocked ? 'b' : '-', info[i].paused ? 'p' : '-', + info[i].shutdown ? 's' : '-', + info[i].crashed ? 'c' : '-', info[i].dying ? 'd' : '-', ((float)info[i].cpu_time / 1e9)); if (verbose) { -- 2.30.2